set the sort_func correctly, 77030

Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
	* gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
	sort_func correctly, 77030

diff --git a/ChangeLog b/ChangeLog
index 3529362fa8320f0dc17804ca54820811c8fa13fd..7bc82f6854be9f4d1a41de71baa98dab90f5ddbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+       * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+       sort_func correctly, 77030
+
 Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
 
        * configure.in: update version to 2.0.2, binary age 2, interface

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3529362fa8320f0dc17804ca54820811c8fa13fd..7bc82f6854be9f4d1a41de71baa98dab90f5ddbb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+       * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+       sort_func correctly, 77030
+
 Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
 
        * configure.in: update version to 2.0.2, binary age 2, interface

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3529362fa8320f0dc17804ca54820811c8fa13fd..7bc82f6854be9f4d1a41de71baa98dab90f5ddbb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+       * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+       sort_func correctly, 77030
+
 Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
 
        * configure.in: update version to 2.0.2, binary age 2, interface

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3529362fa8320f0dc17804ca54820811c8fa13fd..7bc82f6854be9f4d1a41de71baa98dab90f5ddbb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+       * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+       sort_func correctly, 77030
+
 Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
 
        * configure.in: update version to 2.0.2, binary age 2, interface

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3529362fa8320f0dc17804ca54820811c8fa13fd..7bc82f6854be9f4d1a41de71baa98dab90f5ddbb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+       * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+       sort_func correctly, 77030
+
 Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
 
        * configure.in: update version to 2.0.2, binary age 2, interface

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3529362fa8320f0dc17804ca54820811c8fa13fd..7bc82f6854be9f4d1a41de71baa98dab90f5ddbb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+       * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
+       sort_func correctly, 77030
+
 Tue Apr  2 13:44:27 2002  Tim Janik  <timj@gtk.org>
 
        * configure.in: update version to 2.0.2, binary age 2, interface

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index a8bedeecd66ccef2e20963c819210a4f4cc9a0db..4aaca7df68f75ecd6ce4a805d6cacbb6c0822501 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1914,9 +1914,14 @@ gtk_list_store_set_sort_func (GtkTreeSortable        *sortable,
 
   for (list = list_store->sort_list; list; list = list->next)
     {
-      header = (GtkTreeDataSortHeader*) list->data;
-      if (header->sort_column_id == sort_column_id)
-       break;
+      GtkTreeDataSortHeader *list_header;
+
+      list_header = (GtkTreeDataSortHeader*) list->data;
+      if (list_header->sort_column_id == sort_column_id)
+       {
+         header = list_header;
+         break;
+       }
     }
 
   if (header == NULL)

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index e88b92ac59dad8c289fdc714b64c4fb0348a87cc..9d10f986a732a9f8a6ba21830d7f7b737603ccb6 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -2202,9 +2202,14 @@ gtk_tree_store_set_sort_func (GtkTreeSortable        *sortable,
 
   for (list = tree_store->sort_list; list; list = list->next)
     {
-      header = (GtkTreeDataSortHeader*) list->data;
-      if (header->sort_column_id == sort_column_id)
-       break;
+      GtkTreeDataSortHeader *list_header;
+
+      list_header = (GtkTreeDataSortHeader*) list->data;
+      if (list_header->sort_column_id == sort_column_id)
+       {
+         header = list_header;
+         break;
+       }
     }
 
   if (header == NULL)